From: Nick Rosbrook <nick.rosbrook@canonical.com>
Date: Thu, 25 Aug 2022 19:06:59 +0000 (+0200)
Subject: siri/db: add NULL check before calling siridb_tasks_dec
X-Git-Tag: archive/raspbian/2.0.48-1+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8629caf47894022b7dc8f181b7cbf39f41bac818;p=siridb-server.git

siri/db: add NULL check before calling siridb_tasks_dec

Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/siridb-server/+bug/1987558
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1017748
Forwarded: https://github.com/SiriDB/siridb-server/pull/182
Last-Update: 2022-08-24

When built against libuv1 1.44.2, siridb_query_free may call
siridb_tasks_dec on NULL, causing a segfault. Add a NULL check on siridb
before calling siridb_tasks_dec to avoid this.
Last-Update: 2022-08-24
Gbp-Pq: Name 0002-siri-db-add-NULL-check-before-calling-siridb_tasks_d.patch
---

diff --git a/src/siri/db/query.c b/src/siri/db/query.c
index 3f9f7a0a..555628e4 100644
--- a/src/siri/db/query.c
+++ b/src/siri/db/query.c
@@ -156,7 +156,10 @@ void siridb_query_free(uv_handle_t * handle)
     siridb_t * siridb = query->client->siridb;
 
     /* decrement active tasks */
-    siridb_tasks_dec(siridb->tasks);
+    if (siridb != NULL)
+    {
+        siridb_tasks_dec(siridb->tasks);
+    }
 
     /* free query */
     free(query->q);